avoid void pointer math

* gtk/gtkclist.c: avoid void pointer math

* gtk/gtkhscale.c
* gtk/gtkhscrollbar.c
* gtk/gtkvscale.c
* gtk/gtkvscrollbar.c: removed trailing , from enums

* gtk/gtksignal.c: can't use enums as a bitfield type, use guint

* gtk/testgtk.c: removed C++ comment added by owenpoo

-Yosh

diff --git a/ChangeLog b/ChangeLog
index 41d6787e08afc65d6e70d0f15ec6ee66f772e562..6901b2897c3e0337a360d2f5ca4b573b84c3c8e8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Thu Dec 10 20:48:19 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * gtk/gtkclist.c: avoid void pointer math
+
+       * gtk/gtkhscale.c
+       * gtk/gtkhscrollbar.c
+       * gtk/gtkvscale.c
+       * gtk/gtkvscrollbar.c: removed trailing , from enums
+
+       * gtk/gtksignal.c: can't use enums as a bitfield type, use guint
+
+       * gtk/testgtk.c: removed C++ comment added by owenpoo
+
 Thu Dec 10 21:48:34 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdnd.[ch]: Added gtk_drag_source_unset()

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 41d6787e08afc65d6e70d0f15ec6ee66f772e562..6901b2897c3e0337a360d2f5ca4b573b84c3c8e8 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,16 @@
+Thu Dec 10 20:48:19 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * gtk/gtkclist.c: avoid void pointer math
+
+       * gtk/gtkhscale.c
+       * gtk/gtkhscrollbar.c
+       * gtk/gtkvscale.c
+       * gtk/gtkvscrollbar.c: removed trailing , from enums
+
+       * gtk/gtksignal.c: can't use enums as a bitfield type, use guint
+
+       * gtk/testgtk.c: removed C++ comment added by owenpoo
+
 Thu Dec 10 21:48:34 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdnd.[ch]: Added gtk_drag_source_unset()

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 41d6787e08afc65d6e70d0f15ec6ee66f772e562..6901b2897c3e0337a360d2f5ca4b573b84c3c8e8 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,16 @@
+Thu Dec 10 20:48:19 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * gtk/gtkclist.c: avoid void pointer math
+
+       * gtk/gtkhscale.c
+       * gtk/gtkhscrollbar.c
+       * gtk/gtkvscale.c
+       * gtk/gtkvscrollbar.c: removed trailing , from enums
+
+       * gtk/gtksignal.c: can't use enums as a bitfield type, use guint
+
+       * gtk/testgtk.c: removed C++ comment added by owenpoo
+
 Thu Dec 10 21:48:34 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdnd.[ch]: Added gtk_drag_source_unset()

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 41d6787e08afc65d6e70d0f15ec6ee66f772e562..6901b2897c3e0337a360d2f5ca4b573b84c3c8e8 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,16 @@
+Thu Dec 10 20:48:19 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * gtk/gtkclist.c: avoid void pointer math
+
+       * gtk/gtkhscale.c
+       * gtk/gtkhscrollbar.c
+       * gtk/gtkvscale.c
+       * gtk/gtkvscrollbar.c: removed trailing , from enums
+
+       * gtk/gtksignal.c: can't use enums as a bitfield type, use guint
+
+       * gtk/testgtk.c: removed C++ comment added by owenpoo
+
 Thu Dec 10 21:48:34 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdnd.[ch]: Added gtk_drag_source_unset()

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 41d6787e08afc65d6e70d0f15ec6ee66f772e562..6901b2897c3e0337a360d2f5ca4b573b84c3c8e8 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,16 @@
+Thu Dec 10 20:48:19 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * gtk/gtkclist.c: avoid void pointer math
+
+       * gtk/gtkhscale.c
+       * gtk/gtkhscrollbar.c
+       * gtk/gtkvscale.c
+       * gtk/gtkvscrollbar.c: removed trailing , from enums
+
+       * gtk/gtksignal.c: can't use enums as a bitfield type, use guint
+
+       * gtk/testgtk.c: removed C++ comment added by owenpoo
+
 Thu Dec 10 21:48:34 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdnd.[ch]: Added gtk_drag_source_unset()

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 41d6787e08afc65d6e70d0f15ec6ee66f772e562..6901b2897c3e0337a360d2f5ca4b573b84c3c8e8 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,16 @@
+Thu Dec 10 20:48:19 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * gtk/gtkclist.c: avoid void pointer math
+
+       * gtk/gtkhscale.c
+       * gtk/gtkhscrollbar.c
+       * gtk/gtkvscale.c
+       * gtk/gtkvscrollbar.c: removed trailing , from enums
+
+       * gtk/gtksignal.c: can't use enums as a bitfield type, use guint
+
+       * gtk/testgtk.c: removed C++ comment added by owenpoo
+
 Thu Dec 10 21:48:34 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdnd.[ch]: Added gtk_drag_source_unset()

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 41d6787e08afc65d6e70d0f15ec6ee66f772e562..6901b2897c3e0337a360d2f5ca4b573b84c3c8e8 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,16 @@
+Thu Dec 10 20:48:19 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * gtk/gtkclist.c: avoid void pointer math
+
+       * gtk/gtkhscale.c
+       * gtk/gtkhscrollbar.c
+       * gtk/gtkvscale.c
+       * gtk/gtkvscrollbar.c: removed trailing , from enums
+
+       * gtk/gtksignal.c: can't use enums as a bitfield type, use guint
+
+       * gtk/testgtk.c: removed C++ comment added by owenpoo
+
 Thu Dec 10 21:48:34 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdnd.[ch]: Added gtk_drag_source_unset()

diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index 8bcc6b03b17d43e2f7fe7f77efe5afed1fd80f10..fc5fdc24137d8fa8fe1b38de2dfaeecc6e8cb951 100644 (file)
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -2891,7 +2891,7 @@ real_row_move (GtkCList *clist,
        list->data = GINT_TO_POINTER (dest_row);
       else if (first <= GPOINTER_TO_INT (list->data) &&
               last >= GPOINTER_TO_INT (list->data))
-       list->data += d;
+       list->data = GINT_TO_POINTER (GPOINTER_TO_INT (list->data) + d);
     }
   
   if (clist->focus_row == source_row)

diff --git a/gtk/gtkhscale.c b/gtk/gtkhscale.c
index 42b7721c1ab457c9b4474861226bb944e873c3a7..62513627f46881ee48d72744b67a408058598b31 100644 (file)
--- a/gtk/gtkhscale.c
+++ b/gtk/gtkhscale.c
@@ -27,7 +27,7 @@
 
 enum {
   ARG_0,
-  ARG_ADJUSTMENT,
+  ARG_ADJUSTMENT
 };
 
 static void gtk_hscale_class_init    (GtkHScaleClass *klass);

diff --git a/gtk/gtkhscrollbar.c b/gtk/gtkhscrollbar.c
index cf7c6650b80c516a97e253813b6525d108a14ad7..077e39a5550138acfab4827e5107d05eb48523ec 100644 (file)
--- a/gtk/gtkhscrollbar.c
+++ b/gtk/gtkhscrollbar.c
@@ -27,7 +27,7 @@
 
 enum {
   ARG_0,
-  ARG_ADJUSTMENT,
+  ARG_ADJUSTMENT
 };
 
 static void gtk_hscrollbar_class_init       (GtkHScrollbarClass *klass);

diff --git a/gtk/gtksignal.c b/gtk/gtksignal.c
index 6fe59937b81de141a0ef5225e512daab45f96361..26052d21673292b39e6657d2b2734d2f7a2e40b3 100644 (file)
--- a/gtk/gtksignal.c
+++ b/gtk/gtksignal.c
@@ -57,7 +57,7 @@ struct _GtkSignal
   guint                      function_offset;
   GtkSignalMarshaller marshaller;
   GtkType            return_val;
-  GtkSignalRunType    signal_flags : 16;
+  guint                      signal_flags : 16;
   guint                      nparams : 16;
   GtkType           *params;
   GHookList         *hook_list;

diff --git a/gtk/gtkvscale.c b/gtk/gtkvscale.c
index 25a453c1b8bfa6d7aec22d7e142c1f37a1218da6..cacf96426bd8797b745f878a9197b07ebeb7f59f 100644 (file)
--- a/gtk/gtkvscale.c
+++ b/gtk/gtkvscale.c
@@ -27,7 +27,7 @@
 
 enum {
   ARG_0,
-  ARG_ADJUSTMENT,
+  ARG_ADJUSTMENT
 };
 
 static void gtk_vscale_class_init    (GtkVScaleClass *klass);

diff --git a/gtk/gtkvscrollbar.c b/gtk/gtkvscrollbar.c
index d4485283ec01017c54ff0d580fbfc440a7331a21..dba415a5fb674316b883013284994f5faa2ed122 100644 (file)
--- a/gtk/gtkvscrollbar.c
+++ b/gtk/gtkvscrollbar.c
@@ -27,7 +27,7 @@
 
 enum {
   ARG_0,
-  ARG_ADJUSTMENT,
+  ARG_ADJUSTMENT
 };
 
 static void gtk_vscrollbar_class_init       (GtkVScrollbarClass *klass);

diff --git a/gtk/testgtk.c b/gtk/testgtk.c
index 4a24d8e03320f84559ed1ffb984129499fd473ae..9b906bd4447c3f291bb18effd5727cbf3a491fb7 100644 (file)
--- a/gtk/testgtk.c
+++ b/gtk/testgtk.c
@@ -8169,7 +8169,7 @@ void create_layout (void)
          {
            sprintf(buf, "Button %d, %d", i, j);
            if ((i + j) % 2)
-             // button = gtk_button_new_with_label (buf);
+             /* button = gtk_button_new_with_label (buf); */
              button = gtk_combo_new();
            else
              button = gtk_label_new (buf);

diff --git a/tests/testgtk.c b/tests/testgtk.c
index 4a24d8e03320f84559ed1ffb984129499fd473ae..9b906bd4447c3f291bb18effd5727cbf3a491fb7 100644 (file)
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -8169,7 +8169,7 @@ void create_layout (void)
          {
            sprintf(buf, "Button %d, %d", i, j);
            if ((i + j) % 2)
-             // button = gtk_button_new_with_label (buf);
+             /* button = gtk_button_new_with_label (buf); */
              button = gtk_combo_new();
            else
              button = gtk_label_new (buf);